Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

chore: simplify addons config for calico and flannel #3773

Merged
merged 7 commits into from
Sep 2, 2020

Conversation

jackfrancis
Copy link
Member

@jackfrancis jackfrancis commented Sep 1, 2020

Reason for Change:

This PR removes some of the sed tomfoolery for calico and flannel addons specs and instead uses go templating for more easier maintenance.

Also modified the E2E test cluster configs so that the "calico" test uses kubenet for IPAM, and the "calico_azure" test config uses Azure CNI.

Issue Fixed:

Requirements:

Notes:

@codecov
Copy link

codecov bot commented Sep 1, 2020

Codecov Report

Merging #3773 into master will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3773      +/-   ##
==========================================
- Coverage   73.20%   73.20%   -0.01%     
==========================================
  Files         148      148              
  Lines       25375    25384       +9     
==========================================
+ Hits        18576    18582       +6     
- Misses       5663     5666       +3     
  Partials     1136     1136              
Impacted Files Coverage Δ
pkg/engine/templates_generated.go 53.42% <ø> (ø)
pkg/engine/engine.go 85.74% <100.00%> (+0.10%) ⬆️
pkg/engine/virtualmachinescalesets.go 79.96% <0.00%> (-0.41%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1114eb8...0b0e6b4. Read the comment docs.

Copy link
Member

@mboersma mboersma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@acs-bot
Copy link

acs-bot commented Sep 2, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis, mboersma

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [jackfrancis,mboersma]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jackfrancis jackfrancis merged commit 2569b07 into Azure:master Sep 2, 2020
@jackfrancis jackfrancis deleted the addons-calico-flannel-cleanup branch September 2, 2020 21:39
penggu pushed a commit to penggu/aks-engine that referenced this pull request Oct 28, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants